diff --git a/src/api/quotation/quoteProperties.js b/src/api/quotation/quoteProperties.js index d51f021..b1881de 100644 --- a/src/api/quotation/quoteProperties.js +++ b/src/api/quotation/quoteProperties.js @@ -9,3 +9,10 @@ export const saveQuoteProperties = (data) => createAPI(`/quote/detail/properties export const removeQuoteProperties = (data) => createAPI(`/quote/detail/properties/remove`,'post',data) export const updateQuoteProperties = (data) => createAPI(`/quote/detail/properties/update`,'post',data) + +export const queryQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/query`,'post',data) +export const editQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/edit`,'post',data) +export const queryQuoteDetailPropertiesItem = (data) => createAPI(`/quote/detail/properties/item`,'post',data) + +export const deleteQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/delete`,'post',data) +export const newQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/new`,'post',data) diff --git a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue index 24d0984..3ad954e 100644 --- a/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue +++ b/src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue @@ -4,13 +4,9 @@ import {queryQuoteByInquiryNo} from "../../../../api/quotation/quote"; export default { name: "inquiryQuoteDetail", props:{ - inquiryNo:{ - type: String, - required: true - }, - site:{ - type: String, - required: true + quotation: { + type:Object, + required:true }, height:{ type: [String,Number], @@ -498,8 +494,8 @@ export default { methods:{ handleQuery(){ let params = { - internalInquiryNo: this.inquiryNo, - site: this.site + internalInquiryNo: this.quotation.quotationNo, + site: this.quotation.site } this.queryLoading = true; queryQuoteByInquiryNo(params).then(({data})=>{ @@ -529,39 +525,43 @@ export default { } }, watch:{ - inquiryNo(newVal, oldVal){ - this.handleQuery(); - }, - site(newVal, oldVal){ - this.handleQuery(); + "quotation.quotationNo"(newVal,oldVal){ + if (newVal){ + this.handleQuery(); + }else { + this.dataList = []; + } } } } diff --git a/src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue b/src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue index 2a76bf8..617dd33 100644 --- a/src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue +++ b/src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue @@ -255,7 +255,7 @@ export default { this.saveQuotationToolFlag= true; }, clickDeleteToolTableBtn(row){ - this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { + this.$confirm('确定要删除该记录吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -275,7 +275,7 @@ export default { this.$message.warning("请选择要删除的工具记录") return; } - this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { + this.$confirm('确定要删除该记录吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' diff --git a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue index 1ffe49d..059b4ae 100644 --- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue +++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue @@ -14,18 +14,19 @@ import {searchQuoteBomHeader, searchQuoteBomList} from "../../../../api/quotatio import QuoteRouting from "./quotationDetail/quoteRouting.vue"; import {searchQuoteRoutingHeader} from "../../../../api/quotation/quoteOfRouting"; import {queryQuoteDetailBom, queryQuoteDetailRouting} from "../../../../api/quotation/quote"; +import QuoteDetailProperties from "./quotationDetail/quoteDetailProperties.vue"; export default { name:'quoteDetail', - components: {QuoteRouting, BillOfMateriel, CostPrice, PropertyTemplates, ToolQuotation}, + components: {QuoteDetailProperties, QuoteRouting, BillOfMateriel, CostPrice, PropertyTemplates, ToolQuotation}, props:{ header:{ type:Object, request:true, }, height:{ - type:Number, - default:300, + type:[Number,String], + default:'32vh', }, }, watch:{ @@ -780,7 +781,7 @@ export default { }, // 删除 报价明细 deleteQuotationDetailData(row){ - this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { + this.$confirm('确定要删除该记录吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -911,7 +912,7 @@ export default { }, openQuotationDetail(){ this.$nextTick(()=>{ - this.$refs.property.getPropertyTemplatesItem();// 属性 + // this.$refs.property.getPropertyTemplatesItem();// 属性 this.$refs.tool.initQuotationToolData();//刀具 this.searchQuoteBomList();//bom }) @@ -1005,7 +1006,7 @@ export default { quotationDetailStatus:status } updateQuoteDetailStatus(params).then(({data}) => { - if (data.code === 200) { + if (data.code === 0) { this.initData(); this.$message.success(data.msg); } else { @@ -1112,7 +1113,7 @@ export default { fixed width="140" align="center">