From bf625fa396b82db9eb1867c19d4c328d9f956ec4 Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Thu, 12 Dec 2024 10:19:43 +0800 Subject: [PATCH] 2024-12-12 --- src/views/modules/quotation/toBeQuoted.vue | 59 +++++++++++++++---- .../modules/quote/detail/quoteDetail.vue | 2 +- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/views/modules/quotation/toBeQuoted.vue b/src/views/modules/quotation/toBeQuoted.vue index 9345137..6b7eaef 100644 --- a/src/views/modules/quotation/toBeQuoted.vue +++ b/src/views/modules/quotation/toBeQuoted.vue @@ -87,7 +87,7 @@ 查 询 - 报 价 + 报 价 @@ -98,8 +98,6 @@ border v-loading="dataListLoading" row-key='quotationNo' - element-loading-text = "数据正在加载中" - element-loading-spinner = "el-icon-loading" @row-click="quotationClickRow" @selection-change="selectionQuotation" ref="quotationTable" @@ -153,6 +151,27 @@ :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> + + + + + + + + + + + + + + + + 确定 + 取消 + + @@ -516,6 +535,8 @@ export default { columnWidth: 80 }, ], + + quoteVisible:false, } }, created() { @@ -577,15 +598,6 @@ export default { }, // 报价 batchQuotation(){ - if (this.quotationSelections.length === 0){ - this.$message.warning("请选择需报价的单号") - return - } - this.quotationSelections = this.quotationSelections.map(item=>{ - item.createBy = this.$store.state.user.name - item.site = this.$store.state.user.site - return item; - }) this.saveBatchQuotationHeader(this.quotationSelections); }, // 批量新增报价信息 @@ -595,6 +607,7 @@ export default { this.saveBatchQuotationLoading = false; if (data.code === 0){ this.$message.success(data.msg); + this.quoteVisible = false; this.$refs.quotationTable.clearSelection(); this.$router.push({name:"quote-index",params:{ids:data.rows},}) }else { @@ -604,6 +617,19 @@ export default { this.saveBatchQuotationLoading = false; }) }, + handleQuote(){ + if (this.quotationSelections.length === 0){ + this.$message.warning("请选择需报价的单号") + return + } + this.quotationSelections = this.quotationSelections.map(item=>{ + item.qty = 1 + item.createBy = this.$store.state.user.name + item.site = this.$store.state.user.site + return item; + }) + this.quoteVisible = true; + } }, mounted() { @@ -617,6 +643,11 @@ export default { }, "searchData.projectId"(newVal,oldVal){ this.searchData.projectId = newVal.toUpperCase(); + }, + quoteVisible(newVal,oldVal){ + if (newVal === false){ + this.saveBatchQuotationLoading = false; + } } } } @@ -636,4 +667,8 @@ export default { /deep/ .el-input--mini .el-input__icon{ line-height: 20px; } +.el-table /deep/ .cell{ + height: auto; + line-height: 1; +} diff --git a/src/views/modules/quote/detail/quoteDetail.vue b/src/views/modules/quote/detail/quoteDetail.vue index 38b4010..b63aae4 100644 --- a/src/views/modules/quote/detail/quoteDetail.vue +++ b/src/views/modules/quote/detail/quoteDetail.vue @@ -760,7 +760,7 @@ export default { - +