From ec88ae557a7389c65d722d8acd39d184174f6012 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Fri, 21 Feb 2025 16:00:51 +0800 Subject: [PATCH] 20240221 --- src/assets/scss/global.scss | 7 + src/views/modules/quote/index.vue | 41 ++++- .../modules/quote/primary/quoteTable.vue | 2 +- src/views/modules/quote/quoteDetailReport.vue | 41 ++++- src/views/modules/quote/quotes.vue | 167 +++++++++++------- 5 files changed, 191 insertions(+), 67 deletions(-) diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 274e9c0..b5e7080 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -458,3 +458,10 @@ a:hover{ width: 200px; line-height: 18px; } +//盒子高度 +.box-container{ + display: flex; + flex-direction: column; + height: calc(100vh - 100px); + min-height: 200px; +} diff --git a/src/views/modules/quote/index.vue b/src/views/modules/quote/index.vue index d3a590d..e640176 100644 --- a/src/views/modules/quote/index.vue +++ b/src/views/modules/quote/index.vue @@ -20,7 +20,7 @@ import QuoteDetail from "./detail/quoteDetail.vue"; import ChooseListEam from "../common/Chooselist_eam.vue"; import Quotes from "./quotes.vue"; import QuoteGroupDetail from "./detail/quoteGroupDetail.vue"; -import {updateColumnSize} from "../../../api/table"; +import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; export default { name: "quote", @@ -380,6 +380,44 @@ export default { } }, methods:{ + // 动态列开始 获取 用户保存的 格式列 + 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.columns = 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.columns = data.rows + break; + } + } + }) + }, handleColumnResize(newWidth, oldWidth, column, event){ let inData= this.columnList.filter(item => item.columnProp === column.property)[0] inData.columnWidth=newWidth @@ -775,6 +813,7 @@ export default { } this.handleQueryBu();// 查询 BU this.handleSearch(0);// 查询报价信息 + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) }, watch:{ 'quoteForm.customerNo'(newVal, oldVal){ diff --git a/src/views/modules/quote/primary/quoteTable.vue b/src/views/modules/quote/primary/quoteTable.vue index e2b0e8c..7b130e7 100644 --- a/src/views/modules/quote/primary/quoteTable.vue +++ b/src/views/modules/quote/primary/quoteTable.vue @@ -95,7 +95,7 @@ export default { :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip" :align="item.align" - :fixed="item.fixed===''?false:item.fixed" + :fixed="item.fixed === ''?false:item.fixed" :min-width="item.columnWidth" :label="item.columnLabel"> diff --git a/src/views/modules/quote/quoteDetailReport.vue b/src/views/modules/quote/quoteDetailReport.vue index 12e466f..88ddb60 100644 --- a/src/views/modules/quote/quoteDetailReport.vue +++ b/src/views/modules/quote/quoteDetailReport.vue @@ -14,7 +14,7 @@ import QuoteDetailOther from "./detail/primary/quoteDetailOther.vue"; import QuoteDetailCost from "./detail/primary/quoteDetailCost.vue"; import QuoteDetailRouting from "./detail/primary/quoteDetailRouting.vue"; import TpCost from "./detail/tpCost.vue"; -import {updateColumnSize} from "../../../api/table"; +import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; export default { name: "quoteDetailReport", @@ -285,6 +285,44 @@ export default { } }, methods: { + // 动态列开始 获取 用户保存的 格式列 + 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.columns = 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.columns = data.rows + break; + } + } + }) + }, handleColumnResize(newWidth, oldWidth, column, event){ let inData= this.columnList.filter(item => item.columnProp === column.property)[0] inData.columnWidth=newWidth @@ -425,6 +463,7 @@ export default { }, created() { this.getSiteAndBuByUserName(); + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) }, activated() { if (this.$route.params.type && this.$route.params.type === 'quote'){ diff --git a/src/views/modules/quote/quotes.vue b/src/views/modules/quote/quotes.vue index d188fc6..b4c7b82 100644 --- a/src/views/modules/quote/quotes.vue +++ b/src/views/modules/quote/quotes.vue @@ -4,7 +4,7 @@ import {queryQuotationInformationByPage} from "@/api/quote/quotationInformation" import {batchSaveQuote} from "@/api/quote/quote"; import {getSiteAndBuByUserName} from "../../../api/qc/qc"; import {searchInquiryDetailHeaderInfo} from "../../../api/inquiry/inquiryDetail"; -import {updateColumnSize} from "../../../api/table"; +import {getTableDefaultListLanguage, getTableUserListLanguage, updateColumnSize} from "../../../api/table"; export default { name: "quotes", @@ -52,9 +52,9 @@ export default { columns:[ { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1BuDesc', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1BuDesc', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'buDesc', headerAlign: 'center', @@ -70,9 +70,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1rfqNo', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1rfqNo', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'rfqNo', headerAlign: 'center', @@ -88,9 +88,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CustomerNo', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1CustomerNo', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'customerNo', headerAlign: 'center', @@ -106,9 +106,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CustomerDesc', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1CustomerDesc', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'customerDesc', headerAlign: 'center', @@ -124,9 +124,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1RequestDate', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1RequestDate', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'requestDate', headerAlign: 'center', @@ -142,9 +142,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1RequesterName', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1RequesterName', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'requesterName', headerAlign: 'center', @@ -160,9 +160,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1QuoterName', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1QuoterName', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'quoterName', headerAlign: 'center', @@ -178,9 +178,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1RequiredCompletionDate', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1RequiredCompletionDate', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'requiredCompletionDate', headerAlign: 'center', @@ -196,9 +196,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CustomerInquiryNo', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1CustomerInquiryNo', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'customerInquiryNo', headerAlign: 'center', @@ -214,9 +214,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2PartNo', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2PartNo', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'partNo', headerAlign: 'center', @@ -232,9 +232,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2PartDesc', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2PartDesc', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'partDesc', headerAlign: 'center', @@ -250,9 +250,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1Status', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1Status', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'status', headerAlign: 'center', @@ -268,9 +268,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2InquiryQty', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2InquiryQty', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'inquiryQty', headerAlign: 'center', @@ -286,9 +286,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2Unit', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2Unit', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'umName', headerAlign: 'center', @@ -304,9 +304,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2CodeNo', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2CodeNo', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'codeNo', headerAlign: 'center', @@ -322,9 +322,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1PriorityLevel', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1PriorityLevel', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'priorityLevel', headerAlign: 'center', @@ -340,9 +340,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table2Remark', - tableId: '102001Table2', + functionId: 5012, + serialNumber: '5012Table2Remark', + tableId: '5012Table2', tableName: '询价产品表', columnProp: 'remark', headerAlign: 'center', @@ -358,9 +358,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CreateDate', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1CreateDate', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'createDate', headerAlign: 'center', @@ -376,9 +376,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1CreateBy', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1CreateBy', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'createBy', headerAlign: 'center', @@ -394,9 +394,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1UpdateDate', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1UpdateDate', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'updateDate', headerAlign: 'center', @@ -412,9 +412,9 @@ export default { }, { userId: this.$store.state.user.name, - functionId: 102001, - serialNumber: '102001Table1UpdateBy', - tableId: '102001Table1', + functionId: 5012, + serialNumber: '5012Table1UpdateBy', + tableId: '5012Table1', tableName: '询价信息表', columnProp: 'updateBy', headerAlign: 'center', @@ -433,6 +433,44 @@ export default { } }, methods:{ + // 动态列开始 获取 用户保存的 格式列 + 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.columns = 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.columns = data.rows + break; + } + } + }) + }, handleColumnResize(newWidth, oldWidth, column, event){ let inData= this.columnList.filter(item => item.columnProp === column.property)[0] inData.columnWidth=newWidth @@ -521,6 +559,7 @@ export default { }, created() { this.handleQuery(); + this.getTableUserColumn(this.$route.meta.menuId+'table1',1) } }