From ae8c8f584e023cbe1d2f8df3f3e2886c31ab3668 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 12 Sep 2025 17:56:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierQuotation/detail.vue              | 23 ++++++++++---------
 .../supplierQuotation/edit.vue                |  3 ++-
 2 files changed, 14 insertions(+), 12 deletions(-)

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 @@
                 </el-descriptions-item>  
                 <el-descriptions-item>
                     <template slot="label">总金额</template>
-                    {{ baseInfo.bidTotalPrice }}
+                    {{ (baseInfo.quoteAmount/100).toFixed(2) }}
                 </el-descriptions-item>   
                 <el-descriptions-item>
                     <template slot="label">备注</template>
@@ -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
             }