From ea7a858674c1e3f6141a676574654960fcd1317d Mon Sep 17 00:00:00 2001 From: qiezi <15576055375@163.com> Date: Mon, 29 Jul 2024 14:32:23 +0800 Subject: [PATCH] 2024-07-23 --- src/views/modules/code/generation.vue | 6 +-- .../modules/quotation/sellForQuotation.vue | 44 +++++++++++++++---- .../quotationDetail/costPrice.vue | 17 ++++++- .../sellForQuotation/quoteDetail.vue | 22 +++++++++- src/views/modules/test/file/testFile.vue | 4 +- 5 files changed, 76 insertions(+), 17 deletions(-) diff --git a/src/views/modules/code/generation.vue b/src/views/modules/code/generation.vue index 7160759..335189e 100644 --- a/src/views/modules/code/generation.vue +++ b/src/views/modules/code/generation.vue @@ -284,8 +284,7 @@ export default { - -
+
@@ -300,6 +299,7 @@ export default { :loading="loadingIndex === index" :ref="`codeItemValue${index}`" clearable v-if="codeItemTypes[index] === '选择'" + filterable @change="changeRowCodeItemValue(index)" @visible-change="(val)=>changeCodeItemValue(index,val)" style="width: 100%;" @@ -309,7 +309,7 @@ export default {
-
+
({{showConditionName(item.itemValues)}})
diff --git a/src/views/modules/quotation/sellForQuotation.vue b/src/views/modules/quotation/sellForQuotation.vue index 8df9e3a..c79a8bf 100644 --- a/src/views/modules/quotation/sellForQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation.vue @@ -178,8 +178,8 @@ - 内部询价单号 - + 内部询价单号 + @@ -191,9 +191,9 @@ - 客户编码 - @@ -206,10 +206,10 @@ - 项目编码 @@ -234,7 +234,7 @@ - @@ -263,9 +263,9 @@ - 采购专员 - @@ -784,6 +784,10 @@ export default { this.$message.warning("客户编码不存在") return } + this.searchProjectData.projectId = this.insertData.projectId + // setTimeout(()=>{ + // this.searchProjectData.projectId = '' + // },200) this.chooseProjectListFlag = true }, projectClickRow(row) { @@ -1211,6 +1215,28 @@ export default { return {'background-color': '#E8F7F6'} } }, + clickInternalInquiryNoHandle(){ + this.quotationNoSearchData.quotationNo = this.insertData.internalInquiryNo; + // setTimeout(()=>{ + // this.quotationNoSearchData.quotationNo = '' + // },200) + this.quotationNoDialogFlag = true + }, + blurInternalInquiryNoHandle(){ + let params = { + quotationNo:this.insertData.internalInquiryNo, + site:this.$store.state.user.site + } + searchQuotationByQuotationNo(params).then(({data}) => { + if (data && data.code === 0){ + // this.quotationNoData = data.data; + let rows = data.data + if (rows.length === 1){ + this.dblclickQuotationNo(rows[0]) + } + } + }) + } }, computed: {}, watch: { diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue index 630370c..e229604 100644 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue +++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue @@ -74,6 +74,8 @@ export default { {label: "detailProfitRate", value: "利润率"}, {label: "finalUntaxedPrice", value: "最终去税价格"}, ], + copyPackCost:0, + copyShippingCost:0, } }, computed: { @@ -105,7 +107,6 @@ export default { }, rulesValidateLabel(objects, labels) { for (let filed in objects) { - console.log(filed) for (let i = 0; i < labels.length; i++) { let quotationToolColumn = labels[i]; if (quotationToolColumn.label === filed) { @@ -142,6 +143,8 @@ export default { this.copyDetail.adjustToolCost = new Decimal(this.copyDetail.adjustToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber() // 其他成本 this.copyDetail.detailOtherCost = new Decimal(new Decimal(new Decimal(this.shippingCost).add(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber() + this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber() + this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber() // 管理成本 if (!this.copyDetail.detailManageCost){ this.copyDetail.detailManageCost = 0; @@ -297,6 +300,18 @@ export default { v-model="copyDetail.detailManageCost" :step="0" :precision="4" :min="0"/> + + + + + + + + + + { + if (data && data.code === 0){ + if (data.rows && data.rows.length === 1){ + this.dblClickProjectPartTable(data.rows[0]) + } + } + }) + }, // 项目物料双击事件 dblClickProjectPartTable(row){ this.quotationDetail.productNo = row.testPartNo; @@ -997,6 +1011,10 @@ export default { }).catch((error)=>{ this.$message.error(error); }) + }, + clickProjectHandle(){ + this.projectPartData.testPartNo = this.quotationDetail.productNo + this.projectPartDialogFlag = true } }, } @@ -1060,8 +1078,8 @@ export default { - 产品编码 - + 产品编码 + diff --git a/src/views/modules/test/file/testFile.vue b/src/views/modules/test/file/testFile.vue index fab904d..e2c774d 100644 --- a/src/views/modules/test/file/testFile.vue +++ b/src/views/modules/test/file/testFile.vue @@ -111,7 +111,7 @@ export default { // } else { // type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; // } - this.$message.warning(`暂不支持预览${row.fileType.toLowerCase()}文件`) + this.$message.warning(`该文件格式暂不支持预览`) return } @@ -121,7 +121,7 @@ export default { } if (type === ''){ - this.$message.warning(`暂不支持预览${row.fileType.toLowerCase()}文件`) + this.$message.warning(`该文件格式暂不支持预览`) return; } downLoadQuotationFile(row).then(({data}) => {