From c8454f09775de52653182203e181c48839af45ac Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 14 Dec 2022 18:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beginMaterialSlittedSet.vue | 40 +- .../purchasingManagement/searchOrderRoll.vue | 220 +++--- .../searchSAPPurchaseOrder.vue | 21 +- .../yieldReport/com_show_transformed_roll.vue | 129 +++- .../yieldReport/com_transform_part.vue | 669 ++++++++++-------- .../yieldReport/order_transform_part.vue | 133 ++-- 6 files changed, 721 insertions(+), 491 deletions(-) diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue index f8762da..724380b 100644 --- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue +++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue @@ -1033,23 +1033,24 @@ // 获取 用户保存的 格式列 async getTableUserColumn(tableId, columnId) { - this.queryTableUser.tableId = tableId - await getTableUserListLanguage(this.queryTableUser).then(({data}) => { + 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.columnList = [] switch (columnId) { case 1: - this.columnList = data.rows - break; - case 2: this.columnList1 = data.rows break; - case 3: - this.columnList2 = data.rows - break; - case 4: + case 2: this.columnList3 = data.rows break; + } } else { @@ -1061,19 +1062,18 @@ // 获取 tableDefault 列 async getColumnList(tableId, columnId) { this.queryTable.tableId = tableId - await getTableDefaultListLanguage(this.queryTable).then(({data}) => { + 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.columnList1 = data.rows break; - case 3: - this.columnList2 = data.rows - break; - case 4: + case 2: this.columnList3 = data.rows break; } @@ -1081,13 +1081,15 @@ // this.showDefault = true } }) - } + + }, }, created() { this.getMultiLanguageList()//刷新按钮 //获取按钮的权限 this.getButtonAuthData(); - this.getTableUserColumn() + this.getTableUserColumn('102001001Table1',1) + this.getTableUserColumn('102001001Table',2) } } diff --git a/src/views/modules/purchasingManagement/searchOrderRoll.vue b/src/views/modules/purchasingManagement/searchOrderRoll.vue index d14b8d7..92ff8ef 100644 --- a/src/views/modules/purchasingManagement/searchOrderRoll.vue +++ b/src/views/modules/purchasingManagement/searchOrderRoll.vue @@ -95,7 +95,7 @@ :show-overflow-tooltip="item.showOverflowTooltip" :align="item.align" :fixed="item.fixed==''?false:item.fixed" - :mid-width="item.columnWidth" + :min-width="item.columnWidth" :label="item.columnLabel"> diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue index e451265..529f60f 100644 --- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue +++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue @@ -358,20 +358,6 @@ export default { }, data() { return { - visible: false, - queryTable: { - functionId: this.$route.meta.menuId, - tableId: "mainTable", - languageCode: this.$i18n.locale - }, - // 用户table 查询参数 - queryTableUser: { - userId: this.$store.state.user.name, - functionId: this.$route.meta.menuId, - tableId: "mainTable", - status: true, - languageCode: this.$i18n.locale - }, tagNo: '', // 导出 start exportData: [], @@ -1625,7 +1611,12 @@ export default { // 获取 tableDefault 列 async getColumnList(tableId, columnId) { this.queryTable.tableId = tableId - await getTableDefaultListLanguage(this.queryTable).then(({data}) => { + 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: diff --git a/src/views/modules/yieldReport/com_show_transformed_roll.vue b/src/views/modules/yieldReport/com_show_transformed_roll.vue index 6fe6f96..9d9153f 100644 --- a/src/views/modules/yieldReport/com_show_transformed_roll.vue +++ b/src/views/modules/yieldReport/com_show_transformed_roll.vue @@ -2,7 +2,7 @@
- @@ -26,12 +26,16 @@ + + {{ buttons.settingTable }} +
{{labels.wareHouseRollList}} - + @@ -75,10 +82,32 @@ import { searchFunctionButtonList, } from "@/api/sysLanguage.js" +import column from "@/views/modules/common/column"; +import { + getTableDefaultListLanguage, + getTableUserListLanguage, +} from "@/api/table.js" var functionId='C20000002'; export default { + components: { + column, + }, data() { return { + visible: false, + queryTable: { + functionId: 'C20000002', + tableId: "C20000002TransRoll", + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: 'C20000002', + tableId: "C20000002TransRoll", + status: true, + languageCode: this.$i18n.locale + }, labels: { titleCon:'已入库卷清单', partNo:'物料编码:', @@ -123,9 +152,9 @@ export default { transformPartColumns: [ { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollSortNo', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollSortNo', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "sortNo", headerAlign: "center", @@ -137,13 +166,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollRollNo', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollRollNo', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "rollNo", headerAlign: "center", @@ -155,13 +184,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollRollDate', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollRollDate', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "rollDate", headerAlign: "center", @@ -173,13 +202,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollRollQty', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollRollQty', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "rollQty", headerAlign: "center", @@ -191,13 +220,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollOriRollNo', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollOriRollNo', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "oriRollNo", headerAlign: "center", @@ -209,13 +238,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollCreatedDate', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollCreatedDate', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "createdDate", headerAlign: "center", @@ -227,13 +256,13 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, { userId: this.$store.state.user.name, - functionId: 5305, - serialNumber: '5305TransRollCreatedBy', - tableId: "5305TransRoll", + functionId: 'C20000002', + serialNumber: 'C20000002TransRollCreatedBy', + tableId: "C20000002TransRoll", tableName: "转换卷号", columnProp: "createdBy", headerAlign: "center", @@ -245,7 +274,7 @@ export default { columnSortable: false, sortLv: 0, status: true, - fixed: false + fixed: '' }, ], dataListLoading: false, @@ -265,6 +294,8 @@ export default { this.refreshTransformOrderBomData(); //刷新当前派工单的信息 this.refreshPageTableData(); + this.getTableUserColumn(); + this.getMultiLanguageList()//刷新按钮 }, /*关闭modal*/ @@ -318,7 +349,41 @@ export default { } }); }, - +// 打开页面设置 + userSetting() { + this.visible = true; + let queryTable = { + userId: this.$store.state.user.name, + functionId: 'C20000002', + tableId:'C20000002TransRoll', + languageCode: this.$i18n.locale + } + this.$nextTick(() => { + this.$refs.column.init(queryTable); + }); + }, + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data.rows.length > 0) { + //this.columnList = [] + this.transformPartColumns = data.rows + } else { + this.getColumnList() + } + }) + }, + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (!data.rows.length == 0) { + // this.showDefault = false + this.transformPartColumns = data.rows + } else { + // this.showDefault = true + } + }) + }, }, created() { this.getMultiLanguageList()//刷新按钮 diff --git a/src/views/modules/yieldReport/com_transform_part.vue b/src/views/modules/yieldReport/com_transform_part.vue index 172e276..ee5be79 100644 --- a/src/views/modules/yieldReport/com_transform_part.vue +++ b/src/views/modules/yieldReport/com_transform_part.vue @@ -35,21 +35,23 @@ - - - {{buttons.change}} - - + + + {{buttons.change}} + {{ buttons.settingTable }} + +
{{labels.scanList}} +
+ :data="transformPartList" + border + v-loading="dataListLoading" + style="width: 100%; margin-top: -5px;"> diff --git a/src/views/modules/yieldReport/order_transform_part.vue b/src/views/modules/yieldReport/order_transform_part.vue index e1ecafe..7730aad 100644 --- a/src/views/modules/yieldReport/order_transform_part.vue +++ b/src/views/modules/yieldReport/order_transform_part.vue @@ -106,10 +106,31 @@ import { searchFunctionButtonList, } from "@/api/sysLanguage.js" +import { + saveTableDefaultList, + saveTableUser, + getTableDefaultListLanguage, + getTableUserListLanguage, + removerDefault, + removerUser +} from "@/api/table.js" var functionId='102001007'; export default { data() { return { + queryTable: { + functionId: this.$route.meta.menuId, + tableId: "102001007Table", + languageCode: this.$i18n.locale + }, + // 用户table 查询参数 + queryTableUser: { + userId: this.$store.state.user.name, + functionId: this.$route.meta.menuId, + tableId: "102001007Table", + status: true, + languageCode: this.$i18n.locale + }, labels: { site:'工厂编码:', orderNo:'生产订单号:', @@ -162,10 +183,10 @@ export default { transformOrderColumns: [ { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableOrderNo', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableOrderNo', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "orderNo", headerAlign: "center", align: "left", @@ -180,10 +201,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableOrderDate', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableOrderDate', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "orderDate", headerAlign: "center", align: "left", @@ -198,10 +219,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TablePlanReceiptDate', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TablePlanReceiptDate', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "planReceiptDate", headerAlign: "center", align: "left", @@ -216,10 +237,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableStatus', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableStatus', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "status", headerAlign: "center", align: "left", @@ -234,10 +255,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableOrderItemNo', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableOrderItemNo', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "orderItemNo", headerAlign: "center", align: "left", @@ -252,10 +273,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TablePartNo', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TablePartNo', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "partNo", headerAlign: "center", align: "left", @@ -270,10 +291,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TablePartDescription', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TablePartDescription', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "partDescription", headerAlign: "center", align: "left", @@ -288,10 +309,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableQuantity', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableQuantity', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "quantity", headerAlign: "center", align: "right", @@ -306,10 +327,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableCancelledFlag', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableCancelledFlag', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "cancelledFlag", headerAlign: "center", align: "left", @@ -324,10 +345,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableSAPOrderNo', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableSAPOrderNo', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "sAPOrderNo", headerAlign: "center", align: "left", @@ -342,10 +363,10 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 6033, - serialNumber: '6033TableSite', - tableId: "6033Table", - tableName: "查询SAP分卷订单表", + functionId: 102001007, + serialNumber: '102001007TableSite', + tableId: "102001007Table", + tableName: "特殊订单表", columnProp: "site", headerAlign: "center", align: "left", @@ -441,12 +462,34 @@ export default { } }); }, - + // 获取 用户保存的 格式列 + getTableUserColumn() { + getTableUserListLanguage(this.queryTableUser).then(({data}) => { + if (data.rows.length > 0) { + //this.columnList = [] + this.transformOrderColumns = data.rows + } else { + this.getColumnList() + } + }) + }, + // 获取 tableDefault 列 + getColumnList() { + getTableDefaultListLanguage(this.queryTable).then(({data}) => { + if (!data.rows.length == 0) { + // this.showDefault = false + this.transformOrderColumns = data.rows + } else { + // this.showDefault = true + } + }) + }, }, created() { this.getMultiLanguageList()//刷新按钮 + this.getTableUserColumn() //不查询 } }