From 7b208499519f5c7105ec3ea699989b3ea691233f Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Wed, 1 Apr 2026 09:57:37 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-01=20=E8=BF=87=E7=AB=99=E9=87=87?= =?UTF-8?q?=E9=9B=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9D=90=E6=96=99=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=8A=A8=E6=80=81=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yieldReport/com_produce_report_normal.vue | 306 ++++++++++-------- 1 file changed, 167 insertions(+), 139 deletions(-) diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index 33b7f78..c153859 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -938,6 +938,7 @@ import { } from '@/api/wms/wms'; import getLodop from '@/utils/LodopFuncs.js'; import labelPrintTemplates from '@/mixins/labelPrintTemplates.js'; +import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" /*引入组件*/ @@ -1037,10 +1038,10 @@ export default { columnTimeArray: [ { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeSeqNo', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeSeqNo', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "seqNo", headerAlign: "center", align: "center", @@ -1051,14 +1052,14 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeHistSeqNo', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeHistSeqNo', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "histSeqNo", headerAlign: "center", align: "center", @@ -1069,14 +1070,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeRollNo', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeRollNo', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "rollNo", headerAlign: "center", align: "center", @@ -1087,14 +1088,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeEventDesc', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeEventDesc', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "eventDesc", headerAlign: "center", align: "center", @@ -1105,14 +1106,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeDowntimeCode', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeDowntimeCode', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "downtimeCode", headerAlign: "center", align: "center", @@ -1123,14 +1124,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeEventTime', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeEventTime', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "eventTime", headerAlign: "center", align: "center", @@ -1141,14 +1142,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeEnteredby', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeEnteredby', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "enteredby", headerAlign: "center", align: "center", @@ -1159,14 +1160,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeTillTime', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeTillTime', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "tillTime", headerAlign: "center", align: "center", @@ -1177,14 +1178,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeCompletedFlag', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeCompletedFlag', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "completedFlag", headerAlign: "center", align: "center", @@ -1195,14 +1196,14 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeTotalTime', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeTotalTime', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "totalTime", headerAlign: "center", align: "center", @@ -1213,14 +1214,14 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303TimeDowntimePhaseIn', - tableId: "5303Time", - tableName: "时间记录表", + functionId: 104003006, + serialNumber: '104003006TimeDowntimePhaseIn', + tableId: "104003006Time", + tableName: "时间记录", columnProp: "downtimePhaseIn", headerAlign: "center", align: "center", @@ -1231,7 +1232,7 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' } ], columnOrderToolArray: [ @@ -1927,9 +1928,9 @@ export default { columnMaterialArray: [ { userId: this.$store.state.user.name, - functionId: 5303, - serialNumber: '5303MaterialHistSeqNo', - tableId: "5303Material", + functionId: 104003006, + serialNumber: '104003006MaterialHistSeqNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "histSeqNo", headerAlign: "center", @@ -1941,13 +1942,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialReportedBy', - tableId: "5303Material", + serialNumber: '104003006MaterialReportedBy', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "reportedBy", headerAlign: "center", @@ -1959,13 +1960,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialRmRollNo', - tableId: "5303Material", + serialNumber: '104003006MaterialRmRollNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "rmRollNo", headerAlign: "center", @@ -1977,13 +1978,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialBatchNo', - tableId: "5303Material", + serialNumber: '104003006MaterialBatchNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "batchNo", headerAlign: "center", @@ -1995,31 +1996,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, - // { - // userId: this.$store.state.user.name, - // functionId: 5303, - // serialNumber: '5303MaterialTransQty', - // tableId: "5303Material", - // tableName: "派工单材料", - // columnProp: "transQty", - // headerAlign: "center", - // align: "right", - // columnLabel: "可用数量", - // columnWidth: 80, - // columnHidden: false, - // columnImage: false, - // columnSortable: true, - // sortLv: 0, - // status: true, - // fixed: false - // }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialCalcQty', - tableId: "5303Material", + serialNumber: '104003006MaterialCalcQty', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "calcQty", headerAlign: "center", @@ -2031,13 +2014,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialNetIssueQty', - tableId: "5303Material", + serialNumber: '104003006MaterialNetIssueQty', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "netIssueQty", headerAlign: "center", @@ -2049,13 +2032,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialOriginalHistQty', - tableId: "5303Material", + serialNumber: '104003006MaterialOriginalHistQty', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "originalHistQty", headerAlign: "center", @@ -2067,13 +2050,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialPartNo', - tableId: "5303Material", + serialNumber: '104003006MaterialPartNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "partNo", headerAlign: "center", @@ -2085,13 +2068,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialPartDesc', - tableId: "5303Material", + serialNumber: '104003006MaterialPartDesc', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "partDesc", headerAlign: "center", @@ -2103,13 +2086,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialSpec', - tableId: "5303Material", + serialNumber: '104003006MaterialSpec', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "spec", headerAlign: "center", @@ -2121,13 +2104,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialStartDate', - tableId: "5303Material", + serialNumber: '104003006MaterialStartDate', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "startDate", headerAlign: "center", @@ -2139,13 +2122,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialFinishedDate', - tableId: "5303Material", + serialNumber: '104003006MaterialFinishedDate', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "finishedDate", headerAlign: "center", @@ -2157,13 +2140,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialFinishedFlagDesc', - tableId: "5303Material", + serialNumber: '104003006MaterialFinishedFlagDesc', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "finishedFlagDesc", headerAlign: "center", @@ -2175,13 +2158,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialHistType', - tableId: "5303Material", + serialNumber: '104003006MaterialHistType', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "histType", headerAlign: "center", @@ -2193,13 +2176,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialOriginalRMRollNo', - tableId: "5303Material", + serialNumber: '104003006MaterialOriginalRMRollNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "originalRMRollNo", headerAlign: "center", @@ -2211,13 +2194,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialUnissueFlagDesc', - tableId: "5303Material", + serialNumber: '104003006MaterialUnissueFlagDesc', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "unissueFlagDesc", headerAlign: "center", @@ -2229,13 +2212,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialKeyRMFlagDesc', - tableId: "5303Material", + serialNumber: '104003006MaterialKeyRMFlagDesc', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "keyRMFlagDesc", headerAlign: "center", @@ -2247,13 +2230,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialRollNo', - tableId: "5303Material", + serialNumber: '104003006MaterialRollNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "rollNo", headerAlign: "center", @@ -2265,13 +2248,13 @@ export default { columnSortable: true, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialStartFromRollNo', - tableId: "5303Material", + serialNumber: '104003006MaterialStartFromRollNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "startFromRollNo", headerAlign: "center", @@ -2283,13 +2266,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialSAPBOMItemNo', - tableId: "5303Material", + serialNumber: '104003006MaterialSAPBOMItemNo', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "sAPBOMItemNo", headerAlign: "center", @@ -2301,13 +2284,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, functionId: 5303, - serialNumber: '5303MaterialSetupflagDesc', - tableId: "5303Material", + serialNumber: '104003006MaterialSetupflagDesc', + tableId: "104003006Material", tableName: "派工单材料", columnProp: "setupFlagDesc", headerAlign: "center", @@ -2319,7 +2302,7 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' } ], columnRollOpsArray: [ @@ -5503,11 +5486,56 @@ export default { this.sopTotalPage = 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) { + switch (columnId) { + case 1: + this.columnTimeArray = data.rows + break; + case 2: + this.columnMaterialArray = 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.columnTimeArray = data.rows + break; + case 2: + this.columnMaterialArray = data.rows + break; + } + } + }) + }, + }, created() { - // this.factoryList() - // this.getLanguageList() + this.getTableUserColumn(this.$route.meta.menuId+'Material',2) } }