From 772a70ff230a88b74ea2ca5575010aca557416d3 Mon Sep 17 00:00:00 2001 From: yuejiayang <146344614+YangLei105@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:01:30 +0800 Subject: [PATCH] =?UTF-8?q?2024.1.19=20=E6=B4=BE=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=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/qc/FAIResultEntry.vue | 214 +++++++++++++++++------ src/views/modules/qc/FQCResultEntry.vue | 214 +++++++++++++++++------ src/views/modules/qc/IPQCResultEntry.vue | 214 +++++++++++++++++------ 3 files changed, 486 insertions(+), 156 deletions(-) diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue index e40195e..660cf9c 100644 --- a/src/views/modules/qc/FAIResultEntry.vue +++ b/src/views/modules/qc/FAIResultEntry.vue @@ -523,52 +523,15 @@ v-loading="dataListLoading" style="width: 100%;"> - - - - - - - - - - - - - - + v-for="(item,index) in seqDetailColumnList" :key="index" + :sortable="item.columnSortable" + :prop="item.columnProp" + :header-align="item.headerAlign" + :show-overflow-tooltip="item.showOverflowTooltip" + :align="item.align" + :fixed="item.fixed==''?false:item.fixed" + :min-width="item.columnWidth" + :label="item.columnLabel"> @@ -1737,6 +1700,152 @@ qtyrequired:'', lotsize:'' }, + seqDetailColumnList: [ + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3OrderNo', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'orderNo', + headerAlign: "center", + align: "center", + columnLabel: '工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3SeqNo', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'seqNo', + headerAlign: "center", + align: "center", + columnLabel: '派工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3Sku', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3PartNo', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3PartDesc', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3Lotsize', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'lotsize', + headerAlign: "center", + align: "center", + columnLabel: '工单数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3Qtyrequired', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'qtyrequired', + headerAlign: "center", + align: "center", + columnLabel: '派工数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301007, + serialNumber: '301007Table3OperationDesc', + tableId: "301007Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'operationDesc', + headerAlign: "center", + align: "center", + columnLabel: '工序', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + } + ], // 子明细数据对象 tableData: [], checkedDetail: [], @@ -1971,6 +2080,7 @@ // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table1',1) this.getTableUserColumn(this.$route.meta.menuId+'table2',2) + this.getTableUserColumn(this.$route.meta.menuId+'table3',3) }, methods: { @@ -3120,9 +3230,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break; @@ -3149,9 +3259,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break; diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 2a3c724..36aef99 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -722,52 +722,15 @@ v-loading="dataListLoading" style="width: 100%;"> - - - - - - - - - - - - - - + v-for="(item,index) in seqDetailColumnList" :key="index" + :sortable="item.columnSortable" + :prop="item.columnProp" + :header-align="item.headerAlign" + :show-overflow-tooltip="item.showOverflowTooltip" + :align="item.align" + :fixed="item.fixed==''?false:item.fixed" + :min-width="item.columnWidth" + :label="item.columnLabel"> @@ -1736,6 +1699,152 @@ qtyrequired:'', lotsize:'' }, + seqDetailColumnList: [ + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3OrderNo', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'orderNo', + headerAlign: "center", + align: "center", + columnLabel: '工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3SeqNo', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'seqNo', + headerAlign: "center", + align: "center", + columnLabel: '派工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3Sku', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3PartNo', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3PartDesc', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3Lotsize', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'lotsize', + headerAlign: "center", + align: "center", + columnLabel: '工单数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3Qtyrequired', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'qtyrequired', + headerAlign: "center", + align: "center", + columnLabel: '派工数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301015, + serialNumber: '301015Table3OperationDesc', + tableId: "301015Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'operationDesc', + headerAlign: "center", + align: "center", + columnLabel: '工序', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + } + ], // 子明细数据对象 tableData: [], checkedDetail: [], @@ -1970,6 +2079,7 @@ // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table1',1) this.getTableUserColumn(this.$route.meta.menuId+'table2',2) + this.getTableUserColumn(this.$route.meta.menuId+'table3',3) }, methods: { @@ -3128,9 +3238,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break; @@ -3157,9 +3267,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break; diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index d777113..3b6328a 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -586,52 +586,15 @@ v-loading="dataListLoading" style="width: 100%;"> - - - - - - - - - - - - - - + v-for="(item,index) in seqDetailColumnList" :key="index" + :sortable="item.columnSortable" + :prop="item.columnProp" + :header-align="item.headerAlign" + :show-overflow-tooltip="item.showOverflowTooltip" + :align="item.align" + :fixed="item.fixed==''?false:item.fixed" + :min-width="item.columnWidth" + :label="item.columnLabel"> @@ -1782,6 +1745,152 @@ qtyrequired:'', lotsize:'' }, + seqDetailColumnList: [ + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3OrderNo', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'orderNo', + headerAlign: "center", + align: "center", + columnLabel: '工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3SeqNo', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'seqNo', + headerAlign: "center", + align: "center", + columnLabel: '派工单号', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3Sku', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'sku', + headerAlign: "center", + align: "center", + columnLabel: 'SKU', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3PartNo', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partNo', + headerAlign: "center", + align: "center", + columnLabel: '物料编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3PartDesc', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'partDesc', + headerAlign: "center", + align: "center", + columnLabel: '物料名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3Lotsize', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'lotsize', + headerAlign: "center", + align: "center", + columnLabel: '工单数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3Qtyrequired', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'qtyrequired', + headerAlign: "center", + align: "center", + columnLabel: '派工数量', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + }, + { + userId: this.$store.state.user.name, + functionId: 301014, + serialNumber: '301014Table3OperationDesc', + tableId: "301014Table3", + tableName: "派工单号表", + fixed: '', + columnWidth: 80, + columnProp: 'operationDesc', + headerAlign: "center", + align: "center", + columnLabel: '工序', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + } + ], // 子明细数据对象 tableData: [], checkedDetail: [], @@ -2024,6 +2133,7 @@ // 动态列 this.getTableUserColumn(this.$route.meta.menuId+'table1',1) this.getTableUserColumn(this.$route.meta.menuId+'table2',2) + this.getTableUserColumn(this.$route.meta.menuId+'table3',3) }, methods: { @@ -3190,9 +3300,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break; @@ -3219,9 +3329,9 @@ case 2: this.detailColumnList = data.rows break; - // case 3: - // this.columnList2 = data.rows - // break; + case 3: + this.seqDetailColumnList = data.rows + break; // case 4: // this.columnList3 = data.rows // break;