From 623efa584fd02ab4a592ce0d3b923f3c79bee89e Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:53:14 +0800
Subject: [PATCH] =?UTF-8?q?2024.1.31=20=E5=A4=87=E5=93=81=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=EF=BC=9A=E5=8A=A8=E6=80=81=E5=88=97?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partspare/partSpareLocation.vue   | 115 ++++++++-
 src/views/modules/partspare/partspare.vue     | 225 +++++++++++-------
 .../modules/partspare/repairtransdetail.vue   | 139 ++++++++++-
 src/views/modules/partspare/resourcespare.vue | 116 +++++++--
 4 files changed, 486 insertions(+), 109 deletions(-)

diff --git a/src/views/modules/partspare/partSpareLocation.vue b/src/views/modules/partspare/partSpareLocation.vue
index 0634f56..9a1f5b6 100644
--- a/src/views/modules/partspare/partSpareLocation.vue
+++ b/src/views/modules/partspare/partSpareLocation.vue
@@ -157,7 +157,7 @@ import {
   deletePartSpareLocation, // 删除货位
   partSpareLocationTemp, // 打印
 } from '@/api/partspare/partSpareLocation.js'
-
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 import {
   getWareHouseList,
 } from '@/api/partspare/wareHouseEntity.js'
@@ -197,6 +197,11 @@ export default {
       height: 200,
       columnList: [
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableLocationId',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'locationId',
           headerAlign: "center",
           align: "center",
@@ -210,6 +215,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableLocationName',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'locationName',
           headerAlign: "center",
           align: "center",
@@ -223,6 +233,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableWarehouseId',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'warehouseId',
           headerAlign: "center",
           align: "center",
@@ -236,6 +251,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableWarehouseName',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'warehouseName',
           headerAlign: "center",
           align: "center",
@@ -249,6 +269,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableMaxCapacity',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'maxCapacity',
           headerAlign: "center",
           align: "right",
@@ -262,6 +287,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableActive',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'active',
           headerAlign: "center",
           align: "center",
@@ -275,6 +305,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableCreateDate',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'createDate',
           headerAlign: "center",
           align: "center",
@@ -288,6 +323,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableCreateBy',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'createBy',
           headerAlign: "center",
           align: "center",
@@ -301,6 +341,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableUpdateDate',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'updateDate',
           headerAlign: "center",
           align: "center",
@@ -314,6 +359,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId: 200101105,
+          serialNumber: '200101105TableUpdateBy',
+          tableId: "200101105Table",
+          tableName: "货位管理表",
           columnProp: 'updateBy',
           headerAlign: "center",
           align: "center",
@@ -392,6 +442,8 @@ export default {
   created() {
     this.getDataList()
     this.getWareHouseList()
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table',1)
   },
 
   components: {
@@ -656,6 +708,67 @@ export default {
       let s = eval("(" + json + ")")
       return s
     },
+
+    // 动态列开始 获取 用户保存的 格式列
+    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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = 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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
   }
 }
 </script>
diff --git a/src/views/modules/partspare/partspare.vue b/src/views/modules/partspare/partspare.vue
index 77b7c08..b3f5929 100644
--- a/src/views/modules/partspare/partspare.vue
+++ b/src/views/modules/partspare/partspare.vue
@@ -132,6 +132,7 @@
 
 <script>
 import AddOrUpdate from './partspare-add-or-update'
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 import {
   getPartSpareList, deletePartSpare, getPartSpareInfo, updatePartSpareInTransit
 } from '@/api/partspare/partspare.js'
@@ -182,10 +183,10 @@ export default {
       columnList: [
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableSite',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'site',
           headerAlign: "center",
           align: "left",
@@ -200,10 +201,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TablePartNo',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'partNo',
           headerAlign: "center",
           align: "left",
@@ -218,10 +219,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TablePartDescription',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'partDescription',
           headerAlign: "center",
           align: "left",
@@ -236,10 +237,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableSpec',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'spec',
           headerAlign: "center",
           align: "left",
@@ -254,10 +255,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableUmid',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'umid',
           headerAlign: "center",
           align: "left",
@@ -272,10 +273,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableRemark',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'remark',
           headerAlign: "center",
           align: "left",
@@ -290,10 +291,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStock',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stock',
           headerAlign: "center",
           align: "left",
@@ -308,10 +309,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStockInArrive',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stockInArrive',
           headerAlign: "center",
           align: "left",
@@ -326,10 +327,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStockInQuality',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stockInQuality',
           headerAlign: "center",
           align: "left",
@@ -344,10 +345,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStockInConsignment',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stockInConsignment',
           headerAlign: "center",
           align: "left",
@@ -362,10 +363,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStockInPicking',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stockInPicking',
           headerAlign: "center",
           align: "left",
@@ -380,10 +381,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableStockinActive',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'stockinActive',
           headerAlign: "center",
           align: "left",
@@ -398,10 +399,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableQtyonPo',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'qtyonPo',
           headerAlign: "center",
           align: "left",
@@ -416,10 +417,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableMinStock',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'minStock',
           headerAlign: "center",
           align: "left",
@@ -434,10 +435,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableAveragePrice',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'averagePrice',
           headerAlign: "center",
           align: "right",
@@ -452,10 +453,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableEstUseQty',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'estUseQty',
           headerAlign: "center",
           align: "right",
@@ -470,10 +471,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableSCodeControlFlag',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'sCodeControlFlag',
           headerAlign: "center",
           align: "left",
@@ -489,10 +490,10 @@ export default {
 
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableSafetyStock',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'safetyStock',
           headerAlign: "center",
           align: "left",
@@ -506,10 +507,10 @@ export default {
           columnWidth: 140,
         }, {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableActive',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'active',
           headerAlign: "center",
           align: "left",
@@ -523,10 +524,10 @@ export default {
           columnWidth: 140,
         }, {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: 'toolDetail1101ToolId',
-          tableId: "toolOIRecord",
-          tableName: "common",
+          functionId:200101101,
+          serialNumber: '200101101TableWarehouseName',
+          tableId: "200101101Table",
+          tableName: "备品备件信息表",
           columnProp: 'warehouseName',
           headerAlign: "center",
           align: "left",
@@ -551,6 +552,10 @@ export default {
       this.height = window.innerHeight - 170
     })
   },
+  created() {
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table',1)
+  },
   activated() {
     this.getDataList()
     this.getWareHouseList()
@@ -715,6 +720,66 @@ 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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = 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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
     closeDialog() {
 
     }
diff --git a/src/views/modules/partspare/repairtransdetail.vue b/src/views/modules/partspare/repairtransdetail.vue
index 887e7ab..801b5d8 100644
--- a/src/views/modules/partspare/repairtransdetail.vue
+++ b/src/views/modules/partspare/repairtransdetail.vue
@@ -122,6 +122,7 @@
 import {
   getRepairTransDetailList,
 } from '@/api/partspare/repairtransdetail.js'
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 import {
   getWareHouseList,
 } from '@/api/partspare/wareHouseEntity.js'
@@ -167,6 +168,11 @@ export default {
       // 展示列集
       columnList:[
         {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TablePartNo',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'partNo',
           headerAlign: "center",
           align: "left",
@@ -180,6 +186,11 @@ export default {
           columnWidth: 140,
         },
         {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TablePartDescription',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'partDescription',
           headerAlign: "center",
           align: "left",
@@ -192,6 +203,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableSpec',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'spec',
           headerAlign: "center",
           align: "left",
@@ -204,6 +220,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableBatchNo',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'batchNo',
           headerAlign: "center",
           align: "left",
@@ -216,6 +237,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableTransType',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'transType',
           headerAlign: "center",
           align: "left",
@@ -228,6 +254,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableWarehouseId',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'warehouseId',
           headerAlign: "center",
           align: "left",
@@ -240,6 +271,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableLocationId',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'locationId',
           headerAlign: "center",
           align: "left",
@@ -252,6 +288,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId:200101104,
+          serialNumber: '200101104TableOrderRef1',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'orderRef1',
           headerAlign: "center",
           align: "left",
@@ -264,6 +305,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableSupplierID',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'supplierId',
           headerAlign: "center",
           align: "left",
@@ -276,6 +322,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableSupplierName',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'supplierName',
           headerAlign: "center",
           align: "left",
@@ -288,6 +339,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableTransQty',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'transQty',
           headerAlign: "center",
           align: "right",
@@ -300,6 +356,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableRemark',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'remark',
           headerAlign: "center",
           align: "left",
@@ -312,6 +373,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableUserName',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'userName',
           headerAlign: "center",
           align: "left",
@@ -324,6 +390,11 @@ export default {
           fixed: '',
           columnWidth: 140,
         }, {
+          userId: this.$store.state.user.name,
+          functionId: 200101104,
+          serialNumber: '200101104TableTransDate',
+          tableId: "200101104Table",
+          tableName: "出入库明细表",
           columnProp: 'transDate',
           headerAlign: "center",
           align: "left",
@@ -349,6 +420,10 @@ export default {
       this.height = window.innerHeight - 210
     })
   },
+  created() {
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table',1)
+  },
   methods: {
     // 校验用户是否收藏
     favoriteIsOk() {
@@ -500,7 +575,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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = 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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+  },
 }
 </script>
diff --git a/src/views/modules/partspare/resourcespare.vue b/src/views/modules/partspare/resourcespare.vue
index 139e0b6..6d6de24 100644
--- a/src/views/modules/partspare/resourcespare.vue
+++ b/src/views/modules/partspare/resourcespare.vue
@@ -94,6 +94,7 @@
 
 <script>
 import AddOrUpdate from './resourcespare-add-or-update'
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 import {
   getResourceSpareList,deleteResourceSpare
 } from '@/api/partspare/resourcespare.js'
@@ -130,13 +131,12 @@ export default {
       addOrUpdateVisible: false,
       // 展示列集
       columnList: [
-
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TableResourceId',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'resourceId',
           headerAlign: "center",
           align: "left",
@@ -150,10 +150,10 @@ export default {
           columnWidth: 140,
         }, {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TableResourceDesc',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'resourceDesc',
           headerAlign: "center",
           align: "left",
@@ -168,10 +168,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TablePartNo',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'partNo',
           headerAlign: "center",
           align: "left",
@@ -186,10 +186,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TablePartDescription',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'partDescription',
           headerAlign: "center",
           align: "left",
@@ -204,10 +204,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TableSite',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'site',
           headerAlign: "center",
           align: "left",
@@ -222,10 +222,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: this.$route.meta.menuId,
-          serialNumber: '*',
-          tableId: "*",
-          tableName: "*",
+          functionId: 200101102,
+          serialNumber: '200101102TableQtyUsable',
+          tableId: "200101102Table",
+          tableName: "设备备品配件信息表",
           columnProp: 'qtyUsable',
           headerAlign: "center",
           align: "left",
@@ -254,6 +254,10 @@ export default {
       this.height = window.innerHeight - 190
     })
   },
+  created() {
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table',1)
+  },
   methods: {
     // 校验用户是否收藏
     favoriteIsOk() {
@@ -380,7 +384,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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = 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.columnList = data.rows
+              break;
+            // case 2:
+            //   this.columnDetailList = data.rows
+            //   break;
+            // case 3:
+            //   this.columnList2 = data.rows
+            //   break;
+            // case 4:
+            //   this.columnList3 = data.rows
+            //   break;
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
   }
 }
 </script>