diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue index 53ae0b3f..df789204 100644 --- a/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue +++ b/src/views/foodManage/supplierFunction/supplierQuotation/detail.vue @@ -36,7 +36,7 @@ - {{ baseInfo.bidTotalPrice }} + {{ (baseInfo.quoteAmount/100).toFixed(2) }} @@ -95,7 +95,7 @@ export default { dicts: [], data() { return { - goodsInquiryData:{},//页面传参 + supplierQuotationData:{},//页面传参 loading:false, loadingBtn:false, baseInfo: { @@ -153,15 +153,16 @@ export default { }; }, created() { - if(this.$route.query.goodsInquiryData){ - this.goodsInquiryData = JSON.parse(this.$route.query.goodsInquiryData) + if(this.$route.query.supplierQuotationData){ + this.supplierQuotationData = JSON.parse(this.$route.query.supplierQuotationData) + console.log(this.supplierQuotationData) this.getContractInfo() } }, watch:{ - '$route.query.goodsInquiryData':function(newId, oldId) { + '$route.query.supplierQuotationData':function(newId, oldId) { if(newId){ - this.goodsInquiryData = JSON.parse(newId) + this.supplierQuotationData = JSON.parse(newId) this.getContractInfo() }else{ this.baseInfo={} @@ -177,16 +178,16 @@ export default { this.$router.replace({ path: "/foodManage/supplierFunction/supplierQuotation" }); // 要打开的页面 }, getContractInfo(){ - console.log(this.goodsInquiryData) + console.log(this.supplierQuotationData) let param = { - inquiryId:this.goodsInquiryData.inquiryId, - // supplierId:row.supplierId + inquiryId:this.supplierQuotationData.inquiryId, + supplierId:this.supplierQuotationData.supplierId } //查询 getGoodsInquiryDetailInfoApi(param).then((response) => { - this.baseInfo = response.data; + this.baseInfo = this.supplierQuotationData; // this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) - this.materialList = this.baseInfo.detailList; + this.materialList = response.data; // supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => { // this.supplierOptions = response.rows||[]; // }); diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue index 0ad092db..1679a712 100644 --- a/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue +++ b/src/views/foodManage/supplierFunction/supplierQuotation/edit.vue @@ -255,6 +255,7 @@ export default { this.getMaterialTree() if(this.$route.query.supplierQuotationData){ this.supplierQuotationData = JSON.parse(this.$route.query.supplierQuotationData) + console.log(this.supplierQuotationData) this.getContractInfo() } }, @@ -277,7 +278,7 @@ export default { this.$router.replace({ path: "/foodManage/supplierFunction/supplierQuotation" }); // 要打开的页面 }, getContractInfo(){ - console.log(this.supplierQuotationData) + let param = { inquiryId:this.supplierQuotationData.inquiryId }