From 72685eaeab7ad4296e0338268e519f45e963a67f Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:49:22 +0800 Subject: [PATCH] =?UTF-8?q?12.12=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/eam/eamMaintenanceItem.vue | 179 ++++++--- src/views/modules/eam/eamMaintenanceModel.vue | 183 ++++++--- .../modules/eam/eamWorkOrderForCheck.vue | 234 +++++++---- .../eam/eamWorkOrderForMaintenance.vue | 257 +++++++----- .../modules/eam/eamWorkPlanForMaintenance.vue | 247 ++++++++---- .../reportWorkOrder/reportCheckOrder.vue | 339 ++++++++++++---- .../reportMaintenanceOrder.vue | 365 ++++++++++++------ 7 files changed, 1254 insertions(+), 550 deletions(-) diff --git a/src/views/modules/eam/eamMaintenanceItem.vue b/src/views/modules/eam/eamMaintenanceItem.vue index 51ce949..21590e4 100644 --- a/src/views/modules/eam/eamMaintenanceItem.vue +++ b/src/views/modules/eam/eamMaintenanceItem.vue @@ -187,6 +187,10 @@ saveItemAvailable, deleteItemAvailable, } from "@/api/eam/eam.js" + import { + getTableDefaultListLanguage, + getTableUserListLanguage, + } from "@/api/table.js" import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { @@ -276,10 +280,10 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableEamPropertiesItemID', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ItemNo', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'itemNo', headerAlign: "center", align: "left", @@ -290,13 +294,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 80, }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableEamPropertiesItemDesc', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ItemDesc', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'itemDesc', headerAlign: "center", align: "left", @@ -311,10 +316,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableEamPropertiesItemRemark', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ItemRemark', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'itemRemark', headerAlign: "center", align: "left", @@ -329,10 +334,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueType', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ValueType', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'valueType', headerAlign: "center", align: "center", @@ -347,10 +352,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableDefaultValue', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1DefaultValue', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'defaultValue', headerAlign: "center", align: "right", @@ -365,10 +370,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableMaxValue', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1MaxValue', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'maxValue', headerAlign: "center", align: "right", @@ -383,10 +388,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableMinValue', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1MinValue', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'minValue', headerAlign: "center", align: "right", @@ -401,10 +406,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ValueChooseFlag', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'valueChooseFlag', headerAlign: "center", align: "center", @@ -419,10 +424,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1ImageFlag', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'imageFlag', headerAlign: "center", align: "center", @@ -437,10 +442,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1CreatedDate', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'createdDate', headerAlign: "center", align: "center", @@ -451,13 +456,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 105, }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1CreatedBy', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'createdBy', headerAlign: "center", align: "left", @@ -468,13 +474,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1UpdateDate', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'updateDate', headerAlign: "center", align: "center", @@ -485,13 +492,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 105, }, { userId: this.$store.state.user.name, - functionId: 101011, - serialNumber: '101011TableValueChooseFlag', - tableId: "101011Table", - tableName: "common", + functionId: 101003001, + serialNumber: '101003001Table1UpdateBy', + tableId: "101003001Table1", + tableName: "维保项目表", columnProp: 'updateBy', headerAlign: "center", align: "left", @@ -502,6 +510,7 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, ], levelList:[], @@ -552,6 +561,8 @@ created () { this.favoriteIsOk() this.getDataList() + // 动态列 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) }, methods: { // 每页数 @@ -869,7 +880,71 @@ } }, + // 动态列开始 获取 用户保存的 格式列 + 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) { + this.queryTable.tableId = tableId + 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. + } + }) + }, + //动态列结束 } } diff --git a/src/views/modules/eam/eamMaintenanceModel.vue b/src/views/modules/eam/eamMaintenanceModel.vue index 1c37eba..645b2dd 100644 --- a/src/views/modules/eam/eamMaintenanceModel.vue +++ b/src/views/modules/eam/eamMaintenanceModel.vue @@ -128,7 +128,7 @@ - + @@ -357,6 +357,10 @@ getItemLists, deleteModalDetail // 项目单删 } from "@/api/eam/eam.js" + import { + getTableDefaultListLanguage, + getTableUserListLanguage, + } from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -443,9 +447,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1CodeNo', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'codeNo', headerAlign: "center", @@ -457,12 +461,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1CodeDesc', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'codeDesc', headerAlign: "center", @@ -474,12 +479,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1Active', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'active', headerAlign: "center", @@ -491,12 +497,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1CreatedDate', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'createdDate', headerAlign: "center", @@ -508,12 +515,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1CreatedBy', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'createdBy', headerAlign: "center", @@ -525,12 +533,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1UpdateDate', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'updateDate', headerAlign: "center", @@ -542,12 +551,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableActive', - tableId: "101012Table", + functionId: 101003002, + serialNumber: '101003002Table1UpdateBy', + tableId: "101003002Table1", tableName: "维保模板表", columnProp: 'updateBy', headerAlign: "center", @@ -559,11 +569,12 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 206, }, ], detailModelFlag:false, detailList: [], - chooseTableData:[], + chooseTable1Data:[], dataListLoading: false, dataListSelections: [], chooseModalFlag:false, @@ -581,9 +592,9 @@ columnDetailList: [ { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2EamPropertiesItemID', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2ItemNo', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'itemNo', headerAlign: "center", @@ -595,12 +606,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 82, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2EamPropertiesItemDesc', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2ItemDesc', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'itemDesc', headerAlign: "center", @@ -616,9 +628,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2EamPropertiesItemRemark', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2ItemRemark', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'itemRemark', headerAlign: "center", @@ -630,13 +642,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 206, + columnWidth: 298, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2ValueType', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2ValueType', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'valueType', headerAlign: "center", @@ -648,12 +660,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 70, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2DefaultValue', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2DefaultValue', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'defaultValue', headerAlign: "center", @@ -665,12 +678,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2MaxValue', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2MaxValue', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'maxValue', headerAlign: "center", @@ -682,12 +696,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012Table2MinValue', - tableId: "101012Table2", + functionId: 101003002, + serialNumber: '101003002Table2MinValue', + tableId: "101003002Table2", tableName: "维保项目表", columnProp: 'minValue', headerAlign: "center", @@ -699,13 +714,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101012, - serialNumber: '101012TableValueChooseFlag', - tableId: "101012Table", - tableName: "common", + functionId: 101003002, + serialNumber: '101003002Table2ValueChooseFlag', + tableId: "101003002Table2", + tableName: "维保项目表", columnProp: 'valueChooseFlag', headerAlign: "center", align: "center", @@ -716,6 +732,7 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 70, }, ], levelList:[], @@ -767,6 +784,9 @@ created () { this.favoriteIsOk() this.getDataList(); + // 动态列 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + this.getTableUserColumn(this.$route.meta.menuId+'table2',2) }, methods: { // 校验用户是否收藏 @@ -1199,6 +1219,71 @@ this.detailList = data.rows }) }, + // 动态列开始 获取 用户保存的 格式列 + 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) { + this.queryTable.tableId = tableId + 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. + } + }) + + }, + //动态列结束 } } diff --git a/src/views/modules/eam/eamWorkOrderForCheck.vue b/src/views/modules/eam/eamWorkOrderForCheck.vue index 4955dea..694cbd0 100644 --- a/src/views/modules/eam/eamWorkOrderForCheck.vue +++ b/src/views/modules/eam/eamWorkOrderForCheck.vue @@ -339,6 +339,10 @@ updateWorkOrder, // 修改工单 searchFileUrl } from "@/api/eam/eam.js" + import { + getTableDefaultListLanguage, + getTableUserListLanguage, + } from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { @@ -408,10 +412,10 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TablePlanID', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1PlanID', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'planID', headerAlign: "center", align: "center", @@ -426,10 +430,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TablePlanDesc', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1PlanDesc', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'planDesc', headerAlign: "center", align: "center", @@ -444,10 +448,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableOrderNo', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1OrderNo', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'orderNo', headerAlign: "center", align: "center", @@ -462,10 +466,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TablePropertiesCode', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1PropertiesCode', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'propertiesCode', headerAlign: "center", align: "center", @@ -480,10 +484,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TablePropertiesCodeDesc', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1CodeDesc', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'codeDesc', headerAlign: "center", align: "center", @@ -498,10 +502,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableObjectID', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1ObjectID', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'objectID', headerAlign: "center", align: "center", @@ -516,10 +520,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableObjectDesc', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1ObjectDesc', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'objectDesc', headerAlign: "center", align: "center", @@ -534,10 +538,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableStatus', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1Status', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'status', headerAlign: "center", align: "center", @@ -552,10 +556,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TablePlanOperatorName', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1PlanOperatorName', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'planOperatorName', headerAlign: "center", align: "center", @@ -570,10 +574,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableActualOperatorName', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1ActualOperatorName', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'actualOperatorName', headerAlign: "center", align: "center", @@ -588,10 +592,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableActualOperatorName', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1CheckerName', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'checkerName', headerAlign: "center", align: "center", @@ -606,10 +610,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableActualPlanDate', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1PlanDate', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'planDate', headerAlign: "center", align: "center", @@ -624,10 +628,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableActualActualDate', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1ActualDate', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'actualDate', headerAlign: "center", align: "center", @@ -642,10 +646,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableWorkTime', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1WorkTime', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'workTime', headerAlign: "center", align: "right", @@ -660,10 +664,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101014, - serialNumber: '101014TableActualRemark', - tableId: "101014Table", - tableName: "common", + functionId: 101002004, + serialNumber: '101002004Table1Remark', + tableId: "101002004Table1", + tableName: "点检工单表", columnProp: 'remark', headerAlign: "center", align: "center", @@ -701,9 +705,9 @@ columnDetailList: [ { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemID', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2ItemNo', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'itemNo', headerAlign: "center", @@ -719,9 +723,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemDesc', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2ItemDesc', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'itemDesc', headerAlign: "center", @@ -737,9 +741,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemRemark', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2ItemRemark', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'itemRemark', headerAlign: "center", @@ -755,9 +759,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2ValueType', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2ValueType', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'valueType', headerAlign: "center", @@ -773,9 +777,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2DefaultValue', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2DefaultValue', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'defaultValue', headerAlign: "center", @@ -791,9 +795,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2MaxValue', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2MaxValue', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'maxValue', headerAlign: "center", @@ -809,9 +813,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2MinValue', - tableId: "101020Table2", + functionId: 101002004, + serialNumber: '101002004Table2MinValue', + tableId: "101002004Table2", tableName: "点检项目表", columnProp: 'minValue', headerAlign: "center", @@ -869,6 +873,9 @@ created () { this.favoriteIsOk() this.getDataList() + // 动态列 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + this.getTableUserColumn(this.$route.meta.menuId+'table2',2) }, methods: { @@ -1382,6 +1389,71 @@ return acc }, 0) }, + // 动态列开始 获取 用户保存的 格式列 + 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) { + this.queryTable.tableId = tableId + let queryTable= { + functionId: this.$route.meta.menuId, + tableId: tableId, + languageCode: this.$i18n.locale + } + await getTableDefaultListLanguage(queryTable1).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. + } + }) + + }, + //动态列结束 } } diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue index ace4991..460ddb1 100644 --- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue +++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue @@ -384,6 +384,10 @@ searchFileUrl, updateWorkOrder } from "@/api/eam/eam.js" + import { + getTableDefaultListLanguage, + getTableUserListLanguage, + } from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { @@ -459,10 +463,10 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableOrderNo', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1DisposalMeasures', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'disposalMeasures', headerAlign: "center", align: "center", @@ -477,10 +481,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TablePlanID', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1PlanID', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'planID', headerAlign: "center", align: "center", @@ -495,10 +499,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableOrderNo', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1OrderNo', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'orderNo', headerAlign: "center", align: "center", @@ -513,10 +517,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TablePropertiesCode', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1PropertiesCode', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'propertiesCode', headerAlign: "center", align: "center", @@ -532,9 +536,9 @@ { userId: this.$store.state.user.name, functionId: 101014, - serialNumber: '101014TablePropertiesCodeDesc', - tableId: "101014Table", - tableName: "common", + serialNumber: '101014Table1CodeDesc', + tableId: "101014Table1", + tableName: "维保工单表", columnProp: 'codeDesc', headerAlign: "center", align: "center", @@ -549,10 +553,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableObjectID', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1ObjectID', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'objectID', headerAlign: "center", align: "center", @@ -568,9 +572,9 @@ { userId: this.$store.state.user.name, functionId: 101014, - serialNumber: '101014TableObjectDesc', - tableId: "101014Table", - tableName: "common", + serialNumber: '101014Table1ObjectDesc', + tableId: "101014Table1", + tableName: "维保工单表", columnProp: 'objectDesc', headerAlign: "center", align: "center", @@ -585,10 +589,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableStatus', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1Status', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'status', headerAlign: "center", align: "center", @@ -603,10 +607,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TablePlanOperatorName', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1PlanOperatorName', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'planOperatorName', headerAlign: "center", align: "center", @@ -621,10 +625,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualOperatorName', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1ActualOperatorName', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'actualOperatorName', headerAlign: "center", align: "center", @@ -639,10 +643,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualOperatorName', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1Operator', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'operator', headerAlign: "center", align: "center", @@ -657,10 +661,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualOperatorName', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1CheckerName', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'checkerName', headerAlign: "center", align: "center", @@ -675,10 +679,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualPlanDate', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1ActualPlanDate', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'planDate', headerAlign: "center", align: "center", @@ -693,10 +697,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualPlanDate', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1ReachDate', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'reachDate', headerAlign: "center", align: "center", @@ -711,10 +715,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualActualDate', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1ActualDate', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'actualDate', headerAlign: "center", align: "center", @@ -729,10 +733,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableWorkTime', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1WorkTime', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'workTime', headerAlign: "center", align: "right", @@ -747,10 +751,10 @@ }, { userId: this.$store.state.user.name, - functionId: 101018, - serialNumber: '101018TableActualRemark', - tableId: "101018Table", - tableName: "common", + functionId: 101003004, + serialNumber: '101003004Table1Remark', + tableId: "101003004Table1", + tableName: "维保工单表", columnProp: 'remark', headerAlign: "center", align: "center", @@ -795,9 +799,9 @@ columnDetailList: [ { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemID', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2ItemNo', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'itemNo', headerAlign: "center", @@ -809,13 +813,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 90, + columnWidth: 82, }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemDesc', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2ItemDesc', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'itemDesc', headerAlign: "center", @@ -827,13 +831,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 90, + columnWidth: 109, }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2EamPropertiesItemRemark', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2ItemRemark', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'itemRemark', headerAlign: "center", @@ -845,13 +849,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 120, + columnWidth: 478, }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2ValueType', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2ValueType', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'valueType', headerAlign: "center", @@ -867,9 +871,9 @@ }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2DefaultValue', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2DefaultValue', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'defaultValue', headerAlign: "center", @@ -881,13 +885,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 70, + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2MaxValue', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2MaxValue', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'maxValue', headerAlign: "center", @@ -899,13 +903,13 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 70, + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101020, - serialNumber: '101020Table2MinValue', - tableId: "101020Table2", + functionId: 101003004, + serialNumber: '101003004Table2MinValue', + tableId: "101003004Table2", tableName: "维保项目表", columnProp: 'minValue', headerAlign: "center", @@ -917,7 +921,7 @@ sortLv: 0, status: true, fixed: '', - columnWidth: 70, + columnWidth: 65, }, ], submitData:{ @@ -993,6 +997,9 @@ created () { this.getDataList() this.favoriteIsOk() + // 动态列 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + this.getTableUserColumn(this.$route.meta.menuId+'table2',2) }, methods: { @@ -1470,7 +1477,71 @@ } }) }, + // 动态列开始 获取 用户保存的 格式列 + 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) { + this.queryTable.tableId = tableId + 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. + } + }) + }, + //动态列结束 } } diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue index 252d933..ec920b6 100644 --- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue +++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue @@ -369,7 +369,7 @@ - + @@ -742,6 +742,10 @@ getObjList, // 获取设备的差异列表(快速新增) planObjectSearch, 查询该计划的设备 } from "@/api/eam/eam.js" + import { + getTableDefaultListLanguage, + getTableUserListLanguage, + } from "@/api/table.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' export default { @@ -839,9 +843,9 @@ columnList: [ { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanID', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanID', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planID', headerAlign: "center", @@ -853,12 +857,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 97, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanDesc', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanDesc', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planDesc', headerAlign: "center", @@ -870,12 +875,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePropertiesCode', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PropertiesCode', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'propertiesCode', headerAlign: "center", @@ -887,12 +893,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableStatus', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1Status', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'status', headerAlign: "center", @@ -904,12 +911,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanStartDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanStartDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planStartDate', headerAlign: "center", @@ -921,12 +929,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanEndDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanEndDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planEndDate', headerAlign: "center", @@ -938,12 +947,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanEndDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanHaltDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planHaltDate', headerAlign: "center", @@ -955,12 +965,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableNextWorkDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1NextWorkDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'nextWorkDate', headerAlign: "center", @@ -972,12 +983,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, functionId: 101013, - serialNumber: '101013TableOperator', - tableId: "101013Table", + serialNumber: '101013Table1OperatorName', + tableId: "101013Table1", tableName: "点检计划表", columnProp: 'operatorName', headerAlign: "center", @@ -989,12 +1001,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, functionId: 101013, - serialNumber: '101013TableOperator', - tableId: "101013Table", + serialNumber: '101013Table1CheckerName', + tableId: "101013Table1", tableName: "点检计划表", columnProp: 'checkerName', headerAlign: "center", @@ -1006,12 +1019,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanPeriod', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanPeriod', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planPeriod', headerAlign: "center", @@ -1023,12 +1037,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TablePlanPeriod', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1PlanCycle', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'planCycle', headerAlign: "center", @@ -1040,12 +1055,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableCreatedDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1CreatedDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'createdDate', headerAlign: "center", @@ -1057,12 +1073,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableCreatedBy', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1CreatedBy', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'createdBy', headerAlign: "center", @@ -1074,12 +1091,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableCreatedDate', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1UpdateDate', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'updateDate', headerAlign: "center", @@ -1091,12 +1109,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableCreatedBy', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1UpdateBy', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'updateBy', headerAlign: "center", @@ -1108,12 +1127,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, { userId: this.$store.state.user.name, - functionId: 101017, - serialNumber: '101017TableRemark', - tableId: "101017Table", + functionId: 101003003, + serialNumber: '101003003Table1Remark', + tableId: "101003003Table1", tableName: "维保计划表", columnProp: 'remark', headerAlign: "center", @@ -1125,6 +1145,7 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 84, }, ], //项目清单 @@ -1145,9 +1166,9 @@ columnDetailList: [ { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2EamPropertiesItemID', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2ItemNo', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'itemNo', headerAlign: "center", @@ -1159,12 +1180,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 82, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2EamPropertiesItemDesc', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2ItemDesc', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'itemDesc', headerAlign: "center", @@ -1176,12 +1198,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 109, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2EamPropertiesItemRemark', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2ItemRemark', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'itemRemark', headerAlign: "center", @@ -1193,12 +1216,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 478, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2ValueType', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2ValueType', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'valueType', headerAlign: "center", @@ -1210,12 +1234,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 70, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2DefaultValue', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2DefaultValue', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'defaultValue', headerAlign: "center", @@ -1227,12 +1252,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2MaxValue', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2MaxValue', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'maxValue', headerAlign: "center", @@ -1244,12 +1270,13 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009Table2MinValue', - tableId: "101009Table2", + functionId: 101003003, + serialNumber: '101003003Table2MinValue', + tableId: "101003003Table2", tableName: "维保项目表", columnProp: 'minValue', headerAlign: "center", @@ -1261,13 +1288,14 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 65, }, { userId: this.$store.state.user.name, - functionId: 101009, - serialNumber: '101009TableValueChooseFlag', - tableId: "101009Table", - tableName: "common", + functionId: 101003003, + serialNumber: '101003003Table2ValueChooseFlag', + tableId: "101003003Table2", + tableName: "维保项目表", columnProp: 'valueChooseFlag', headerAlign: "center", align: "center", @@ -1278,6 +1306,7 @@ sortLv: 0, status: true, fixed: '', + columnWidth: 70, }, ], itemModalData:{ @@ -1622,6 +1651,9 @@ created () { this.favoriteIsOk() this.getDataList() + // 动态列 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) + this.getTableUserColumn(this.$route.meta.menuId+'table2',2) }, methods: { // 点击行选中复选框 @@ -2442,6 +2474,71 @@ }).catch(() => { }) }, + // 动态列开始 获取 用户保存的 格式列 + 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) { + this.queryTable.tableId = tableId + 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. + } + }) + + }, + //动态列结束 } } diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 0b4fafc..d4535cc 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -71,25 +71,25 @@ border v-loading="dataListLoading" style="width: 100%;"> - - - - - - + + + + + + + + + + + + + + + + + + + { + 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.columnHistoryList = data.rows + break; + // case 4: + // this.columnList3 = data.rows + // break; + } + + } else { + this.getColumnList(tableId, columnId) + } + }) + + }, + // 获取 tableDefault 列 + async getColumnList(tableId, columnId) { + this.queryTable.tableId = tableId + 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.columnHistoryList = data.rows + break; + // case 4: + // this.columnList3 = data.rows + // break; + } + } else { + // this.showDefault = true. + } + }) + + }, + //动态列结束 } } diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue index 93a8795..ea194e2 100644 --- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue +++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue @@ -104,7 +104,7 @@ layout="total, sizes, prev, pager, next, jumper"> - + @@ -144,7 +144,7 @@ - + @@ -279,7 +279,7 @@ - +
{ + 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.columnHistoryList = data.rows + break; + case 4: + this.columnHistoryDetailList = data.rows + break; + } + + } else { + this.getColumnList(tableId, columnId) + } + }) + + }, + + // 获取 tableDefault 列 + async getColumnList(tableId, columnId) { + this.queryTable.tableId = tableId + 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.columnHistoryList = data.rows + break; + case 4: + this.columnHistoryDetailList = data.rows + break; + } + } else { + // this.showDefault = true. + } + }) + + }, + //动态列结束 } }