From 14b11e553855425755bd91accd63c83871e7ff30 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Mon, 8 Sep 2025 18:22:47 +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=B94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierQuotation/index.vue               |  4 ++--
 .../supplierManage/goodsSupplier/index.vue    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
index 7e3df1c0..7f2667ac 100644
--- a/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
+++ b/src/views/foodManage/supplierFunction/supplierQuotation/index.vue
@@ -45,8 +45,8 @@
         </el-table-column>
         <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
         <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
-        <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/>
-        <el-table-column label="决标总价(元)" align="center" prop="quoteAmount" :show-overflow-tooltip="true" width="120">
+        <!-- <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/> -->
+        <el-table-column label="报价总额(元)" align="center" prop="quoteAmount" :show-overflow-tooltip="true" width="120">
             <template slot-scope="scope">
                <span>{{ (scope.row.quoteAmount/100).toFixed(2) }}</span>
             </template>
diff --git a/src/views/foodManage/supplierManage/goodsSupplier/index.vue b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
index 7d7d000a..42bd9ce1 100644
--- a/src/views/foodManage/supplierManage/goodsSupplier/index.vue
+++ b/src/views/foodManage/supplierManage/goodsSupplier/index.vue
@@ -493,12 +493,17 @@ export default {
             let flag = false;
             if(row.alternativeSuppliers&&row.alternativeSuppliers.length>0){
                 let index = row.alternativeSuppliers.findIndex(v=>v.supplierId==item.supplierId)
-                if(index==-1){
-                    flag=false
+                if(index==-1){ 
+                    if(item.status==1){
+                        flag=false
+                    }else{
+                        flag=true
+                    } 
                 }else{
                     flag=true
-                }
+                } 
             }
+           
             return flag;
         },
         //首选选过的供应商，不能在备选里选
@@ -507,9 +512,13 @@ export default {
             let flag = false;
             if(row.supplierId&&row.supplierId!=""){
                 if(item.supplierId==row.supplierId){
-                    flag=true
+                    if(item.status==1){
+                        flag=false
+                    }else{
+                        flag=true
+                    } 
                 }else{
-                    flag=false
+                    flag=true
                 } 
             }
             return flag;