From dcc248fe475c8451a481543170187834a2141829 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 31 Aug 2024 16:32:09 +0800
Subject: [PATCH] md

---
 src/views/emis/emisWaybill/waybillModify.vue | 13 +++++++++++--
 src/views/emis/emisWaybill/waybillRecord.vue |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 1615afc3..277f164e 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -113,12 +113,12 @@
                   </el-col>
                   <el-col :span="6" v-if="form.pickupMethod==2">
                     <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
-                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" :sideCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
+                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" :siteCode="form.sendSiteCode" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6" v-if="form.pickupMethod==1">
                     <el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
-                      <EmisUserSimplePicker1 :placeholder="$t('操作员')"  :sideCode="form.sendSiteCode"  v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
+                      <EmisUserSimplePicker1 :placeholder="$t('操作员')"  :siteCode="form.sendSiteCode"  v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
                     </el-form-item>
                   </el-col>
 
@@ -1880,6 +1880,10 @@ methods: {
           // console.log("===>calcExp222==expr==>",expr);
           // console.log("===>calcExp222==row==>",row);
         }
+
+
+
+
       }
 
     }
@@ -1894,12 +1898,17 @@ methods: {
           let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
           if(res.code==200){
              newFee=newFee*Number(res.data);
+             newFee=newFee.toFixed(2);
              item.remark="汇率:"+res.data+","+newFee+"(CNY)"
           }
         }
 
         newFee=newFee.toFixed(2);
         totalFee=Number(totalFee)+Number(newFee);
+
+        if(item.blAutoGen==0){
+          item.fee=item.realFee;
+        }
       }
     }
     this.form.freight = totalFee.toFixed(2);
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 15d9549b..5dfa0054 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1898,7 +1898,7 @@ methods: {
           let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
           if(res.code==200){
              newFee=newFee*Number(res.data);
-             newFee=newFee*Number(res.data).toFixed(2);
+             newFee=newFee.toFixed(2);
              item.remark="汇率:"+res.data+","+newFee+"(CNY)"
           }
         }