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 @@
-
-
+
+
{{ (scope.row.quoteAmount/100).toFixed(2) }}
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;